From: Joakim Verona <joakim@verona.se>
Date: Tue, 13 Aug 2013 16:51:49 +0000 (+0200)
Subject: merge from trunk
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=cf79cb9c1756f794b4f5c77b058d09e713f7b364;p=emacs.git

merge from trunk
---

cf79cb9c1756f794b4f5c77b058d09e713f7b364